x86: Relax spinlock checks during shutdown or S3.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
index 4eeec4ae547df80f8529a8ba445d01f78071e565..4c6f76d61e4918363d8dfaa64dd7b1e1a38e50f9 100644 (file)
--- a/xen/arch/x86/acpi/power.c
+++ b/xen/arch/x86/acpi/power.c
@@ -175,6 +175,7 @@ static int enter_state(u32 state)
     printk("Entering ACPI S%d state.\n", state);
 
     local_irq_save(flags);
+    spin_debug_disable();
 
     if ( (error = device_power_down()) )
     {
@@ -208,6 +209,7 @@ static int enter_state(u32 state)
     printk(XENLOG_INFO "Finishing wakeup from ACPI S%d state.", state);
 
  done:
+    spin_debug_enable();
     local_irq_restore(flags);
     console_end_sync();
     acpi_sleep_post(state);

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 2e8c622963aad12a374d14f089a1e1f72e56fe39..18340e5b25a321e38af323d302db770f836a865d 100644 (file)
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -302,6 +302,7 @@ void machine_restart(unsigned int delay_millisecs)
 
     watchdog_disable();
     console_start_sync();
+    spin_debug_disable();
 
     local_irq_enable();